Merge changes from topic "am-5800a049f47e48cc842286063d55064d" into...

Merge changes from topic "am-5800a049f47e48cc842286063d55064d" into udc-d1-dev-plus-aosp am: 979df4d3 am: 0b20c78b

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



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