Merge "Adds a menu item for additional battery info to battery settings." into nyc-mr2-dev
am: bd775165d4

Change-Id: I3b5d1278bf2d2e237b9d0c7bd8349de451fc263b