Merge changes Ieb7f33bc,I81b56862 am: ace52c4ff8 am: cce65333a4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb68b5e1c2a3d653af675bae227bf8a5e3a4d72e