Merge "msm_shared: scm: Using correct service name for memory protection"