Merge changes from topic "am-1c09b97641184f4390a7f3836d5c973c" into...

Merge changes from topic "am-1c09b97641184f4390a7f3836d5c973c" into udc-d1-dev-plus-aosp am: 82a925b8 am: 31639d5a

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



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