Merge changes from topic "am-34ea56a49ad34136a9c961933968e3de" into udc-dev...

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

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



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