Merge "Add BatteryUsageStatsProtoTests to presubmit" into sc-dev