[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: 4dd84bbe -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5a651572d752ef102d40ca730644f9dcbf1ddbe9