Merge "Refactor NetworkSecurityPolicy to be pluggable"
am: 645d13e59f

* commit '645d13e59fd9e216bf7f141b9cd2b8bca96dd9d3':
  Refactor NetworkSecurityPolicy to be pluggable