Merge "Merge "Adjust the dialer to match the latest spec" into pi-car-dev am: a753794b20" into qt-dev
am: 60256f9d06

Change-Id: If46ce7264123ff8dce0a125110b21c16bfc10ab0