tree 0d10cb17d2d9239e6db126a934eb87e3bfb62622
parent 1fb336646238647380c545805b0721ca4c32069b
parent e92206f6f4c663c063f958827d821323c240c3c9
author Xin Li <delphij@google.com> 1633655993 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633655993 +0000

[automerger skipped] Merge Android 12 am: e92206f6f4 -s ours

am skip reason: Merged-In I96fe6556a3c305b80013b9523089c26ecbf9ffd8 with SHA-1 1fb3366462 is already in history

Original change: https://android-review.googlesource.com/c/device/generic/car/+/1847413

Change-Id: Ie1768b978aa562d9e40027d6c3dc173566297366