Merge "msm: ocmem: Call restore_sec_config() after every power collapse"