Merge changes from topic "am-1a118fe584b54a8383edaaccdf95d928" into...

Merge changes from topic "am-1a118fe584b54a8383edaaccdf95d928" into udc-d1-dev-plus-aosp am: b3b4ca14 -s ours

am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 1f758ee3 is already in history

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



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