[automerger skipped] Merge changes I8b34a94c,I46e62ab9 into android13-tests-dev am: c8b9250b82
am: a012a313fc
am: 0a269fbe73
am: bc7427a55e
-s ours am: a6b8c5baac
-s ours am: 5355d3419d
-s ours am: aee4e40e4e
-s ours am: 361e604fc6
-s ours
am skip reason: Merged-In I8b34a94c11d7cc174821483f624fd083ca1763ac with SHA-1 e0fb4d0ce5
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2660177
Change-Id: Iad269806e8adf322fe9839473c81b369d4622eac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
9aba25bace