Merge "Make isRebootRequiredForModemConfigChange SystemApi"