Merge changes from topic "am-e3fad35317474c4f87d63b23fcb944f2" into udc-dev am: 67b5bb4b am: 42b28f03

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



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