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: I95c2f249f3c6be95a8ee1b9844236c36d740a387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>