Merge "DO NOT MERGE: Disable night UI mode in battery saver." into pi-dev
am: cd8eace91d

Change-Id: I3d6d5c3c4f00e7f04be9eefbd94809feeea821ff