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

Change-Id: I1cd8d676e5e77317badac997661db5b5a1a48ee5