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

Merge "Merge "Remove CHOOSER_UNBUNDLED flag" into udc-dev am: 6f5a721a am: dce2f7c5 am: 1709edce" into udc-qpr-dev-plus-aosp am: 40319fa6

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



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