[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 28cde8fd -s...

[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 28cde8fd -s ours am: 062aac9f -s ours am: ffef0b84 -s ours

am skip reason: Merged-In I3ad2e2000fb0db6a62835e621bc81d77308db140 with SHA-1 e08d1410 is already in history

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



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