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

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

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