Merge "Don't persist new night mode setting in car mode am: 98288b3e0f am: eb840269c7" into qt-r1-dev-plus-aosp
am: 73cec17e36

Change-Id: I98e4dde446deb162f21e1f88dcbfb82c55efb8c9