Merge "Use an attribute for the network security config resource" into nyc-dev