Merge changes I5c190938,I9abec5d2,If1007966 into rvc-qpr-dev am: 24038f61c5 am: 0860ab432e

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

Change-Id: Iebcea9aa9d660cd6b65f9330a369dd79d88e0101