[automerger skipped] Merge Android U (ab/10368041) am: 7d3ffbae -s ours am:...

[automerger skipped] Merge Android U (ab/10368041) am: 7d3ffbae -s ours am: 5e747452 -s ours am: dcc389b1 -s ours am: 0fdb2048 -s ours

am skip reason: Merged-In I3c9e9d15786fbead1b874636b46844f6c24bccc2 with SHA-1 8a809c6e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24181342



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