tree 1f1e87bfc0c30446376a36a354c3416c47a5352f
parent 6ac3dbd35b21ecaaf44c6be641bab590e2298bfa
parent 9a91142cd49bff1483cb28c3ca252142b5db4c37
author Bill Yi <byi@google.com> 1635981529 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635981529 +0000

[automerger skipped] Merge SP1A.211105.004 to aosp-master - DO NOT MERGE am: a78e10992f -s ours am: f717ad3c77 -s ours am: 9a91142cd4 -s ours

am skip reason: Merged-In I6c9dae2628641dedc3f83194fcc729d1b1be3baf with SHA-1 421dad191f is already in history

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

Change-Id: I2bcf49faeaeb143c51277c1d650b701cc5d349da