Merge "Add a method to determine if a reboot is required to alter the modem config" am: 3483983223
am: 215383a8c3

Change-Id: I07189ff44859e1e6e07f1bdaed5e9d4957897475