Merge changes from topic "am-2cd577b60ab642c08a2b360ed6207496" into...

Merge changes from topic "am-2cd577b60ab642c08a2b360ed6207496" into udc-d1-dev-plus-aosp am: 7b6faa5b -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: I255da3ce63f6b020f321e66cb34313eb3de0eb05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>