Merge "timer: Update code that migrates timers and hrtimers during isolation" into msm-4.9