Merge "DO NOT MERGE: Update BatteryStatsValidationTest skip checks" into pie-cts-dev