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

am skip reason: Merged-In I15c117c23bf073e737ddf24df888ee56321f96c5 with SHA-1 0bfaf44653 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/barbet-kernel/+/16573432

Change-Id: I6a15d64f80279128508c0a0288525214a8a255db