[automerger skipped] Merge "Merge android13-tests-dev" am: 056da746 am: 3ed23345 -s ours

am skip reason: Merged-In Ie372f74f3a52decce592181c7d65624f8ec03ed1 with SHA-1 ad325a01 is already in history

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



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