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

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



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