Merge "ShortcutManager: Support secondary text field." into nyc-dev am: ca0ee28
am: a3d8cdc

* commit 'a3d8cdca997e0577bcb1d9091880a0267e2d3f38':
  ShortcutManager: Support secondary text field.

Change-Id: I5262a756c5fe50e498192aea8e247f46d5742edc