Merge "BatteryStatsNoteTest: Fix GPS related tests."