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

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



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