Merge changes from topic "am-b5578662fcd8400f84906704012a3e6d" into udc-dev am: a73675d9

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



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