Merge changes from topic "am-9a6011fb4dd7487bb7f7e206e92d2fa1" into...

Merge changes from topic "am-9a6011fb4dd7487bb7f7e206e92d2fa1" into udc-d1-dev-plus-aosp am: d2246d67 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 e7ea4378 is already in history

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



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