[automerger skipped] Merge UP1A.231005.007 am: 9fa48e8fef -s ours am: 09225c9d54 -s ours am: b774ea57c0 -s ours am: b8434c6b91 -s ours

am skip reason: Merged-In I898dedb62b96757c69e7873ca859b95ef5371d9c with SHA-1 7524d846c7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/barbet/+/24879481

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