Merge "Revert "msm: ocmem: Disable low power state for memory macros""