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

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

Change-Id: If7e3e8cfc14b1d7225a4167a4e8dac900c62b7e3