Merge "Remove UI_MODE_CAR for QS because it isn't doing anything right now." into oc-dr1-dev
am: 700cd6528b

Change-Id: I54c78e1d5db31174d4e9ed9480a233e09470f815