Merge changes from topic "am-58b29118ae39485fad1c557dbc8088f4" into...

Merge changes from topic "am-58b29118ae39485fad1c557dbc8088f4" into udc-dev-plus-aosp am: dc6aa55a am: 7a16e973

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



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