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

Change-Id: I8f1102dbba29ac7bcb9553d5929ef2fb8ce1eb7d