Merge changes from topic "am-71531a99c0b14c8983ca9c32774be72a" into...

Merge changes from topic "am-71531a99c0b14c8983ca9c32774be72a" into udc-d1-dev-plus-aosp am: 9965e0c5 -s ours

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

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



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