[automerger skipped] Merge "Merge SQ1A.220205.002" am: d1f4639c86 am: 64cbd06c07 -s ours
am skip reason: Merged-In Ib2b0342af85679c0514fb4d88530376b58e6e12a with SHA-1 96aa501bb1 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1975158
Change-Id: I481044664de67c02b9c20bd88d69082c39e8daed
This commit is contained in: