am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev

* commit 'dbca76cda1a2a6fa95c592654f8649cb30b65833':
  Fix Array Index Out of Bounds in BatteryStatsImpl