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