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: I3fd7cd956669de63aab7db9e8b0818df9fc61bb2