Bug: 200123115 Test: atest BatteryStatsTests Change-Id: I750a5c9fa3faa9757625b2d2494df1484b68016d (cherry picked from commit 9cb96030)