Merge changes I8b34a94c,I46e62ab9 into android13-tests-dev am: c8b9250b am:...

Merge changes I8b34a94c,I46e62ab9 into android13-tests-dev am: c8b9250b am: a012a313 am: 0a269fbe

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



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