[automerger skipped] Merge "Backporting the change of ag/15629060 to...

[automerger skipped] Merge "Backporting the change of ag/15629060 to rvc-qpr-dev" into rvc-qpr-dev am: 9f4825bc am: 58c145ca am: a9966eb0 -s ours am: b98958d1 -s ours

am skip reason: Merged-In I7e2f95fd85e18127dc481f188ace8ad6effc4831 with SHA-1 8f005ffe is already in history

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

Change-Id: I6069c6e78ccff68471ea05c13a66b160b7b706dd