Revert "Revert "CHOOSER_UNBUNDLED -> droidfood""

This reverts commit 70c8493962a36577fb3f72cb8c5b237f8c7481f6.

Reason for revert: Re-enabling with test fix.

Change-Id: Id5706e37c3ed85c39c795680158a3f00edf8509b
2 files changed