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