Merge "Show empty options in shortcut chooser dialog if shortPreference is...
Merge "Show empty options in shortcut chooser dialog if shortPreference is unchecked." into rvc-dev am: 68084f39 am: 957fffe0
Change-Id: Ic3b87f0dc3a5bd619f9340c800f6b14d9bb5b7fa