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