Merge "Refactor NetworkSecurityPolicy to be pluggable" am: 645d13e59f
am: 19aeed568a  -s ours

* commit '19aeed568a1985780717416ea1e67d046cbd077b':
  Refactor NetworkSecurityPolicy to be pluggable