[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: 13261d17 -s ours am: 05727c03 -s ours am: 3da1cdde -s ours am: 5f546d96 -s ours

am skip reason: subject contains skip directive

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



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