Merge "Don't persist new night mode setting in car mode" into qt-r1-dev am: 46b9bb83bf
am: c108cfdd08

Change-Id: I1dc242430e2c5151a20ec2f079695759ebfccb7f