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

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

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

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