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

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

Change-Id: Ib4ce0406b8a215772a50ac85cf6ee56e395bd157