Merge changes from topic "am-73bb4c2bdb294c428b32f2fd74a86ef4" into udc-dev am: fae2b9f8 am: f0ed0b01

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



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