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

Change-Id: Id16d50f95d14b2bd4cb29df0443a08a40159a8e1