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

Merge changes from topic "am-e47ad970db264cefacfa1740565126dd" into udc-d1-dev-plus-aosp am: 1c83a69b -s ours

am skip reason: Merged-In I6e70e238b3a5ace1cab41ec5796a6bb4d79769f2 with SHA-1 48223d60 is already in history

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



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