Merge changes from topic "am-e0c65f3a1087420c9886a200482b2be0" into...

Merge changes from topic "am-e0c65f3a1087420c9886a200482b2be0" into udc-d1-dev-plus-aosp am: a4903053 -s ours

am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff4 is already in history

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



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