base

Fix one-action choosers with EXTRA_INITIAL_INTENTS

Fix a bug where initial intents weren't respected as valid options
when there is only one choice available.

Bug 21304304

Change-Id: I304ee6acf20a367da6296132f85d913ad9fce127