Merge "msm: net: ecm: change resource manager feature enable/disable scope"