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

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

Change-Id: I48302376de322fe4efbfe82c176449b35112337e