Merge changes from topic "am-73bb4c2bdb294c428b32f2fd74a86ef4" into udc-dev am: fae2b9f8

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



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