[automerger skipped] Merge Android U (ab/10368041) am: be12e2b4fe -s ours am: a740d3b798 -s ours am: ba4ef7521f -s ours

am skip reason: Merged-In I9df388226e3d34e6d2d8db11b8839b9270f96fb3 with SHA-1 ee31badb9e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/24181576

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