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

Change-Id: I90f2dc2ab69c60f31c3b88a128fa7542de9d9780