[automerger skipped] Merge Android 14 am: 548bf62a67 -s ours

am skip reason: Merged-In I7eb8185821ca7bb277604a67c5443fd5e503e4ea with SHA-1 9ba8e81cf4 is already in history

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

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