Merge "msm: mpm: Use clock API to prevent XO shutdown"