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

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

Change-Id: Ifc78a4aa74d0a408ed99f58470f086ca632b366f