Merge changes from topic "am-ce25b81c53d94c168f1ee1946f7a2722" into...

Merge changes from topic "am-ce25b81c53d94c168f1ee1946f7a2722" into udc-d1-dev-plus-aosp am: fdd74611 -s ours

am skip reason: Merged-In Ia52db359691f6076ed04dc9108c26410c7aeb372 with SHA-1 0eec13f3 is already in history

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



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