Merge "Use an attribute for the network security config resource" into nyc-dev...
Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf3 am: 76d3d859
am: be04f724
* commit 'be04f724':
Use an attribute for the network security config resource
Change-Id: I5c2213114bf26a4506a64c5a5a8a2e592610783d