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

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



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