Merge "Add required permission for BatteryStatsTest" into sc-dev