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

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

Change-Id: I6e1574f67ac45ec8b2f4ae863633ced57acb2b8b