Merge "Revert "msm: modem-8960: Check if the modem is alive after restarting it"" into msm-3.4