Merge "Fix NPE when creating dynamic shortcuts" into ub-contactsdialer-h-dev am: 334bc5fdda
am: d1666a299a

Change-Id: I3d62b8a18b65bc6099cb0dde79aa2961a0fa9743