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

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

Change-Id: I69e3cdf27a93c03ce1293a307d889982ad399311