[automerger skipped] Merge "Merge Android 12" am: 59772dd098
-s ours
am skip reason: Merged-In I76b505672b7c78b03a9c79df6473212ea5c65072 with SHA-1 4e9cab823d
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1847928
Change-Id: I8e0d9a4a976b62ddb5fc5ffae58d44e7bea12441
This commit is contained in:
commit
c8e48296a0