[automerger skipped] Merge "Merge Android U (ab/10368041)" into...

[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 22d35f5a -s ours am: ddaee505 -s ours am: 6bfdee0b -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: If9ff10a81c2f854b5b2a75474a1c1f134583c66a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>