[automerger skipped] Merge changes I561d6864,I7e909cda into 24D1-dev am: 76ea415c -s ours

am skip reason: Merged-In I561d68645f3f159b029135b0dfa66511a2800d72 with SHA-1 fb8f3945 is already in history

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



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