Merge "Revert "Revert "CHOOSER_UNBUNDLED -> droidfood""" into tm-qpr-dev am: 91066345b7 am: d317933718

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

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