Merge "Add NetworkSecurityConfigProvider"