tree 1f1e87bfc0c30446376a36a354c3416c47a5352f
parent 0bfaf44653f1b016a742f2f672d539ec392bbc72
parent d9469225e14f8b8a86705f5cb54c434cbba66055
author Bill Yi <byi@google.com> 1641520906 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641520906 +0000

[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