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

Change-Id: I23e289d24c918004596a465f3f572b63bb0f0879