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

Merge changes from topic "am-ca79711f122e4944a8cb2481678537ba" into udc-dev-plus-aosp am: 2333a526 -s ours

am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 01f65561 is already in history. Merged-In was found from reverted change.

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

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



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