Merge changes from topic "am-07dcff1663bd41bca2de4f5740b04f8f" into...

Merge changes from topic "am-07dcff1663bd41bca2de4f5740b04f8f" into udc-d1-dev-plus-aosp am: 00517259 -s ours

am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 820fe895 is already in history

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



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