Merge "Add dynamic launcher shortcuts." into ub-contactsdialer-g-dev
am: 22a46701a7

Change-Id: I4a21513a28215a3189b49421e26c11d1f375980e