Merge "Update light mode when battery saver changes" into nyc-mr1-dev am: 891411aaa5 am: 594a4918f8
am: 31b42a2058

Change-Id: I591b5037086726ceee09876e6cad8b79b6293a09