Merge changes I4256ca5f,I91528e1a,I48bd594c am: be331ab3a7 am: 22679c8f68 am: 1ea2b93620

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7201b62010a56962a16a89bb43cbde75cda22e14