Merge changes from topic "am-8b605c8c93e44d9496dd253c3890705b" into...

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