Merge "platform: msm_shared: Retry on data timeout error"