Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev