[automerger skipped] Merge Android U (ab/10368041) am: 749da4055d -s ours am: bad06d0532 -s ours am: 66d78d5dfc -s ours am: 883299a6c6 -s ours

am skip reason: Merged-In I3ee86aef476fdf3e95ee61a20f6565e5b507b680 with SHA-1 cd6a664423 is already in history

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

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