Merge changes from topic "am-34ea56a49ad34136a9c961933968e3de" into udc-dev am: 001d8a99

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



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