Merge changes from topic "am-074a4079410e45ab88bda7ff824d0b06" into...

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