Merge changes from topic "am-10bee4a4c8a54427adfb68327670981d" into...

Merge changes from topic "am-10bee4a4c8a54427adfb68327670981d" into udc-d1-dev-plus-aosp am: ba53b063 am: 5664fdbd

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



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