Merge "Fix incorrect switch status when user stay in NightDisplaySettings page...

Merge "Fix incorrect switch status when user stay in NightDisplaySettings page while scheduled night lights on" into main am: cdca9397 am: ca445ed0

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181238



Change-Id: I1175ad2c5dfeccf51fa8efc533d44e470ea7514a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>