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

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

am skip reason: Merged-In Ie406c180af48653595e8e222a15b4dda27de2e0e with SHA-1 df4686dc is already in history

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



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