Merge changes from topic "am-72df0acce0834d81aa8fef7f2caae738" into udc-dev-plus-aosp am: a2855c64

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



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