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

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

am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 4ddfad25 is already in history

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



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