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

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



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