Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev