Merge "Merge "Make isRebootRequiredForModemConfigChange SystemApi" am: 55faf37439 am: 367a7baf96 am: a2cbf01609"