[automerger skipped] Merge "Merge SQ1A.220205.002" am: d1f4639c am:...

[automerger skipped] Merge "Merge SQ1A.220205.002" am: d1f4639c am: 64cbd06c -s ours am: 5626b574 -s ours

am skip reason: Merged-In Ib2b0342af85679c0514fb4d88530376b58e6e12a with SHA-1 96aa501b is already in history

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

Change-Id: I1f8805b60aef2b2a6b5ffe1ce944fae84174c417