Merge "Backporting the change of ag/15629060 to rvc-qpr-dev" into rvc-qpr-dev am: 9f4825bc am: 58c145ca am: 260e0dfd

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

Change-Id: Icb14af6d975e7150505eb02f2da799dcbaa204a4