Merge "Disable ignore battery optimization items that can't change" into mnc-dev