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

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

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