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

Merge changes from topic "am-abc1aecfde8b414e8a954e3a2b089cf9" into udc-d1-dev-plus-aosp am: 5aa3e212 -s ours

am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 658ed370 is already in history

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



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