Merge changes from topic "am-2a2835bb6a724438991d9f91a970330e" into...

Merge changes from topic "am-2a2835bb6a724438991d9f91a970330e" into udc-d1-dev-plus-aosp am: c2cbc3fb -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: Icee792bcb25ed8fac11cb7dde386b11a9b791ac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>