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

Merge changes from topic "am-1a1f3c7fa0bc4d04b4af37394390a5ce" into udc-d1-dev-plus-aosp am: 6a5ddfaf -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/+/24337625



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