[automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am:...

[automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 71f31d7f -s ours am: 03d27ae1 -s ours am: 9ab1449c -s ours

am skip reason: Merged-In I421c13e65efa565753337dc21e6520682e726e81 with SHA-1 f0c77219 is already in history

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



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