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

[automerger skipped] Merge changes I8b34a94c,I46e62ab9 into android13-tests-dev am: c8b9250b -s ours am: 212b60a0 -s ours

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

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



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