Merge changes I72976905,I7a637d39 am: da498a524d am: f6aaaaddda am: 0c8fa5e245

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

Change-Id: I462d4d27ea36beacbad85ef9187419ae979dc4bb