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

Change-Id: I7067b815ecbd8b90316f4db01e2db0a49d49614c