Merge "Merge "Remove ChooserSelector." into udc-dev am: 81e21a54" into...

Merge "Merge "Remove ChooserSelector." into udc-dev am: 81e21a54" into udc-dev-plus-aosp am: 0bf4826d am: d4276911

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



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