[automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 71f31d7f37 -s ours am: 03d27ae173 -s ours

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

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

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