Merge changes I044d0363,I0be3b802,Ib584ea57,I92291023 am: 10640379e4 am: b74f548024

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1888339

Change-Id: Ie2f10aa2f1222022eb46aeb5b4a5c250053ac954