[automerger skipped] Merge Android U (ab/10368041) am: 71b8a57731 -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: I835baec8681872919713dfeef8e016909ff2bb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>