Merge changes from topic "am-e3fad35317474c4f87d63b23fcb944f2" into udc-dev am: 67b5bb4b am: 78baf0fc

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



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