[automerger skipped] Merge "Add a method to determine if a reboot is required to alter the modem config" am: 3483983223 am: 215383a8c3
am: ce301951ae -s ours
am skip reason: change_id I841b947efda0016c003f54ecf7853624582abab9 with SHA1 7eca4afab4 is in history

Change-Id: I3cab1af043c84a106d490c6de19adacbb5080dd3