Merge changes from topic "am-160435ba7a904c8da8af35bf77ff9d55" into...

Merge changes from topic "am-160435ba7a904c8da8af35bf77ff9d55" into udc-d1-dev-plus-aosp am: badfa50c

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



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