Merge "Fix a NPE in BatteryStatsImpl" into pi-dev
am: 0587bdd59f

Change-Id: I3bcc5d38995a38f068df6251826050fd59325e80