Merge changes from topic "am-ef54cdcc7e34474ca5a8849467f05dd8" into...

Merge changes from topic "am-ef54cdcc7e34474ca5a8849467f05dd8" into udc-d1-dev-plus-aosp am: 47bc6897 -s ours

am skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 58b32712 is already in history

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



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