Merge "Show empty options in shortcut chooser dialog if shortPreference is unchecked." into rvc-dev am: 68084f39d0 am: 2e36e9ba67 am: eaf2e1c860
Change-Id: Icd40cfde01e2eef603611850c7bae0a88631634b
This commit is contained in: