Merge "Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am: db11f55c am: 7a3df454" into oc-dr1-dev-plus-aosp