Merge "Change command like set-default-dialer to be a test override." into qt-dev
am: ef4ddd1281

Change-Id: I5c63d24294740235b94c18fc9996dd81f0cd583c