Merge "Merge android13-tests-dev" am: 056da74605

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

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