[automerger skipped] Merge "Backporting the change of ag/15629060 to rvc-dev" into rvc-dev am: 964ddbbbcc am: f04c496b3b am: d90941ca06 am: 581ed87073 -s ours am: 2dd1ec0b7e -s ours
am skip reason: Merged-In I7e2f95fd85e18127dc481f188ace8ad6effc4831 with SHA-1 8f005ffe4a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15750102
Change-Id: I98f7b84b54d61283a9f9b44556963a10b28a7f94
This commit is contained in: