Merge changes Ifcb0f60e,I09ecdff9 am: 5bc68e02a0 am: 6f4a8baa7a

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

Change-Id: I56d536bc3de868678e80d6cb1641e619b6410937