Merge changes from topic "am-9a0effb20ed94241acab5dc7fd3ee86f" into...

Merge changes from topic "am-9a0effb20ed94241acab5dc7fd3ee86f" into udc-d1-dev-plus-aosp am: 4b17ee17 am: d5b048fa

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



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