Merge "Use O APIs for shortcuts from QuickContact" into ub-contactsdialer-i-dev
am: d2b97ea42b

Change-Id: I2ed67f11d42426660de7a2f2fef3cf4cca5c03c6