[automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO...

[automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 99d8d1fd -s ours

am skip reason: Merged-In I4c199ec81b3f30a3a12ae40af29185549387d34d with SHA-1 9be07bf5 is already in history

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

Change-Id: I128f5ed6c1bad350ea449bba5da21123de3ea31b