Merge "Don't persist new night mode setting in car mode am: 98288b3e am: eb840269" into qt-r1-dev-plus-aosp