Merge "Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 am: c6a49bb008" into nyc-mr1-dev-plus-aosp
am: 343301a624
* commit '343301a6249eec9c98a57b9030ef20eed74e52ca':
Change-Id: I696845073d7d875ba183eb738e36ff735f71c17d
This commit is contained in: