[automerger skipped] Merge changes I8b34a94c,I46e62ab9 into android13-tests-dev am: c8b9250b82 am: a012a313fc am: 8fc264aa16 -s ours am: 56c33f07a6 -s ours am: 68b65dcdeb -s ours am: 0f0c65953a -s ours am: a66514a1c4 -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: I365d26a50fe2eeb8c8f43927fe242e092d6ac040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>