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

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

Change-Id: Ib0be181eda2f1dd44ee77d54d3e1ba6cc33c37e3