Merge "Adds a menu item for additional battery info to battery settings." into...
Merge "Adds a menu item for additional battery info to battery settings." into nyc-mr2-dev am: bd775165
am: 482b2732
Change-Id: I7b2edb14a37ecda747dcbe5290ef72ef87d1767d