[automerger skipped] Merge Android 14 am: 9c361341ee -s ours am: a113f4f84d -s ours

am skip reason: Merged-In I2f35dfb3a24c6887e1524a63fdc7e62df236d4b8 with SHA-1 5f498d0c73 is already in history

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

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