Merge changes from topic "am-471d06a1ce5d4ffc951301aeabee7123" into...

Merge changes from topic "am-471d06a1ce5d4ffc951301aeabee7123" into udc-d1-dev-plus-aosp am: 89d831d0 -s ours

am skip reason: Merged-In I1e886f9ccb7203714216da061c35e793b2a63d8a with SHA-1 5a0f6c5b is already in history

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



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