[automerger skipped] Merge changes I8b34a94c,I46e62ab9 into android13-tests-dev am: c8b9250b82 -s ours am: 212b60a0db -s ours am: a38c66cd10 -s ours am: cf13e3b462 -s ours am: 1be2061332 -s ours

am skip reason: Merged-In I8b34a94c11d7cc174821483f624fd083ca1763ac with SHA-1 bf75a4070d is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2660177

Change-Id: Idad50a115e9cc546ccd750b0f9ba3ddccf47633c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>