Merge "Correct night light qs tile time formatting." into pi-dev am: 6567c65fa1
am: aa0d1fefe3

Change-Id: Ice7b55ca3851db5a63efa2ba3f5a0842996dc92b