Merge \"Merge \\\"BatteryStats: Bump checkin format version to 18\\\" into...
Merge \"Merge \\\"BatteryStats: Bump checkin format version to 18\\\" into nyc-dev am: d75bc225 am: 69a983df\" into nyc-mr1-dev-plus-aosp
am: 5185fe59
Change-Id: I03d7eb6ac64efc50b6dbf13306fd92a9387b6179