Merge changes from topic "am-d8624bcb55864d2ab4ee67868cce88db" into udc-dev-plus-aosp am: 0e57ee80

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



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