Merge changes from topic "am-9405aeab34b3408385388844851bfc18" into...

Merge changes from topic "am-9405aeab34b3408385388844851bfc18" into udc-d1-dev-plus-aosp am: 996a0a55 -s ours

am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 552ec325 is already in history

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



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