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

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

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