Merge "msm: ADSPRPC: Error handling during pd restart"