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

Merge "[automerger skipped] Backporting the change of ag/15629060 to pi-dev am: 95ff59db am: e317818b am: 8f758cff am: 30d1571a am: be868a5a am: f80f8fed am: 61f37c50 -s ours am: 394e1fc3 -s ours" into sc-v2-dev-plus-aosp am: 7c7acdf3 -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/+/15748731

Change-Id: I5e36e8b6acb620c73087d3c7678dd015b88201bb