Merge changes Ieb7f33bc,I81b56862 am: ace52c4ff8 am: cce65333a4 am: 4b9362793f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie296e709b883fc2930b83dffbfb1366dd4a7e7e7