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

Change-Id: I1a0f60a46822df9bf46d2bfee4a3b7a2ff10862e