Merge android12L-tests-dev@8941410 am: be8ea4d3a8 am: 7ad1370553

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

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