Merge "Revert "CHOOSER_UNBUNDLED -> droidfood"" into tm-qpr-dev am: 49e0e9e2b8 am: 5405e5de53

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

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