[automerger skipped] Merge "Add a method to determine if a reboot is required to alter the modem config" am: 4733dab5a2 am: b0a1d161a9
am: e36e84a580 -s ours
am skip reason: change_id Ieb48ccbb6832f5bf1e959722fa93cbfd8f9e9718 with SHA1 5fe5ef2e32 is in history

Change-Id: I0ee47cb07f4bc0e5aa340512b64ed9ddb255b1e0