[automerger skipped] Merge Android 14 am: 36e6499a89 -s ours am: f22713cff3 -s ours am: 8c2a654d2e -s ours am: 7cdf0b65f1 -s ours

am skip reason: Merged-In I50c56fb867c5ddaac28d7cb8cfc97ec015a27b29 with SHA-1 c38f53a913 is already in history

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

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