Merge changes from topic "am-258388b26c1c4d73bc8a4bb36dabff1b" into udc-d1-dev-plus-aosp am: b0eb29c5

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



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