[automerger skipped] Merge "Updated UiModeManagerService to always trigger...

[automerger skipped] Merge "Updated UiModeManagerService to always trigger configuration change for setNightMode if it is AAE." into qt-qpr1-dev am: 73582b6d -s ours am skip reason: Change-Id I6450dda422622ac29862f5d1fc362e23f55228f0 with SHA-1 3eee9437 is in history am: b61ec0e2 -s ours
am skip reason: Change-Id I6450dda422622ac29862f5d1fc362e23f55228f0 with SHA-1 3eee9437 is in history

Change-Id: Ib93e9d392d602fbac3c5b88aa091420d1bb3aab4