[automerger skipped] Merge UP1A.230905.019 am: 2b8cabe73b -s ours am: 467cb0db87 -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: I3e165ba8b704c99fd982260dee3fc523077503aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>