Merge changes from topic "am-1603f24401cb4b80b30abe7791366099" into...

Merge changes from topic "am-1603f24401cb4b80b30abe7791366099" into udc-d1-dev-plus-aosp am: a53442d1 -s ours

am skip reason: Merged-In I4ef415437568ae165ac5a3153d18bd2e2ef1f808 with SHA-1 69f9efe5 is already in history

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



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