Merge changes from topic "am-91f34c8b6884482e8ce0f1d44f4f1a1b" into...

Merge changes from topic "am-91f34c8b6884482e8ce0f1d44f4f1a1b" into udc-d1-dev-plus-aosp am: ed4e0e16 -s ours

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

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



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