[automerger skipped] Merge "Merge "DO NOT MERGE: Disable night UI mode in...

[automerger skipped] Merge "Merge "DO NOT MERGE: Disable night UI mode in battery saver." into pi-dev am: cd8eace9" into pi-dev-plus-aosp
am: 2e563d40 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie49dffa45ffd0ae48f031d6cdad9562270c7e672