Merge "Remove BatteryStatsValidationTest#testGpsUpdates" into rvc-dev