[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: 90d1995d -s ours am: 131b642e -s ours am: b5ddd1e3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie09aba7f8b1101d0858ec789d74a6dd4232379a4