Merge "Fix DynamicShortcutsTests" into ub-contactsdialer-h-dev
am: 6c69230836

Change-Id: Ibe74dbf0d0eaa4ac1d5ffbee7ff1f314b6c6a6c2