[automerger skipped] DO NOT MERGE - Merge Android 13 am: 28f2e0f791 -s ours

am skip reason: Merged-In I369174b20da3f40357dc68d8a3260a58b51d8a3f with SHA-1 d6fa02809e is already in history

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

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