[automerger skipped] Merge "Stop and abort network scan if modem resets." am:...
[automerger skipped] Merge "Stop and abort network scan if modem resets." am: b2731d87 am: cef5739a
am: 43c72e77 -s ours
am skip reason: change_id I74eeef3d86273f425d232f64b85515ef3e7f20ed with SHA1 a1127157 is in history
Change-Id: I147e88589d137e3f3577cef7f2487d736d63862c