Merge changes from topic "am-855081f4ef024d119bec3c728b06877f" into...

Merge changes from topic "am-855081f4ef024d119bec3c728b06877f" into udc-dev-plus-aosp am: 4cc1b852

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



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