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

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



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