Merge \"Merge \\\"Fixed statuses on Battery Saver column.\\\" into nyc-dev am: 24b2e7bbee am: 28318faf16\" into nyc-mr1-dev-plus-aosp
am: 4a9c54610e

Change-Id: Id346251c47c7d313eb652b809d088ffb82904d0e