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

Merge changes from topic "am-73bb4c2bdb294c428b32f2fd74a86ef4" into udc-dev am: fae2b9f8 am: 3ec34896 am: 92c9add6 am: 7e0164a6

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



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