Merge "Remove tests in BatteryStatsValidationTest" into rvc-dev am: 95a05ec875

Change-Id: Ic180cd07e992be39d6bb2be32b5029c9e5eba7b9