[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 skip reason: Merged-In If6d2b8ed55a1e6562dc30a8de9fdb734fdd2b6ae with SHA-1 6d4eaaab is already in history

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

Change-Id: I00d8ada286d6004e02dcaf7c76957e90e7175ce4