Merge changes I0f1d59ae,I2f63bffb am: 9f7a73fc21 am: 87caaf0da8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibdba196ea0f31979717b6e06edc62653b2dc6d74