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

[automerger skipped] Merge changes I8b34a94c,I46e62ab9 into android13-tests-dev am: c8b9250b am: a012a313 am: 0a269fbe am: bc7427a5 -s ours am: a6b8c5ba -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: I22549bc87ce77e92de20e0dba0e0ec432ea695f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>