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

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



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