Merge "Updated UiModeManagerService to always trigger configuration change for setNightMode if it is AAE."