[automerger skipped] Merge Android U (ab/10368041) am: 71b8a57731 -s ours am: e776bcd6f3 -s ours am: 1a8c601532 -s ours am: e0d36096bf -s ours

am skip reason: Merged-In I2d8cce47e30d9f06122957fdb307b353af4d63b1 with SHA-1 c50b4734ad is already in history

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

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