Merge "msm: msm_watchdog: Don't pet the watchdog if it isn't enabled" into msm-3.0