Merge "setCarMode() only when car mode changes" into nyc-mr1-dev am: 6bcf0cdf37
am: 83af5b494a

Change-Id: If77543cca75a27667a7c3bc19a1bd7aebb225aa3