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

Merge changes from topic "am-edab55e843ed4ad9aadca12edf8bcb21" into udc-dev-plus-aosp am: 4185a2f4 -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: Ie01d265de89a4864389fc2a182d35df28df7d8af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>