Merge changes Ic134c432,I5c5c1233 into rvc-qpr-dev am: 45f8014a04

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

Change-Id: Id64d101dec22d9f34e11eb652a0745620b2f01bf