[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: 4867e1ad -s ours am: 098bfa13 -s ours am: 555f5b5c -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16573297

Change-Id: I22f34cfa5cf4c47240fc4a39884946a72e14778a