Merge "Remove CHOOSER_UNBUNDLED flag" into udc-dev am: 6f5a721a am:...

Merge "Remove CHOOSER_UNBUNDLED flag" into udc-dev am: 6f5a721a am: 5de34c4c am: 304722a4 am: a532f399

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



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