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: 5b9145dd am: f155d65d am: a9594d44 -s ours am: 51aec9b6 -s ours" into sc-v2-dev-plus-aosp am: ae638d2e -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: Icdc2f5c70d90726e5f63a4f6bf4dd09f813c306b