Merge changes Ie0b32460,I21028457,I82754375 am: 29e5346c24 am: e8c002d842 am: 71f05fff22

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e28cde0569c263c6afe5ad722be4060912eae0e