[automerger skipped] Merge "Merge SP2A.220305.012" into stage-aosp-master am:...

[automerger skipped] Merge "Merge SP2A.220305.012" into stage-aosp-master am: 5409ef1a -s ours am: ffdfacae -s ours

am skip reason: Merged-In I748fdd49626acaa0e986a9d8038039cada6faa60 with SHA-1 8f368c53 is already in history

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

Change-Id: I161aaec86e2c2b2a9e60d4022e3ee09d5307e9dc