[automerger skipped] Merge UP1A.230905.019 am: 3e9a7f5242 -s ours am: 6c4cddc799 -s ours am: 92eea7d7c8 -s ours

am skip reason: Merged-In Iff37b366a8c54c913b36115319ed0c4e025b2a70 with SHA-1 1bfdea9aa9 is already in history

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

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