[automerger skipped] Merge changes I8b34a94c,I46e62ab9 into...

[automerger skipped] Merge changes I8b34a94c,I46e62ab9 into android13-tests-dev am: c8b9250b am: a012a313 am: 8fc264aa -s ours am: 56c33f07 -s ours am: 68b65dcd -s ours am: a381b0b4 -s ours am: e8da972e -s ours

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

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



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