[automerger skipped] Merge "Snap tm-dev to android13-tests-dev" into tm-dev...

[automerger skipped] Merge "Snap tm-dev to android13-tests-dev" into tm-dev am: 5a1bde04 am: a9e748a5 am: 654a9735 -s ours am: 7791fbb4 -s ours

am skip reason: Merged-In I33a86ec62662ba4738c70c15b77ece0135da7d29 with SHA-1 5f5827a1 is already in history

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



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