am 2faa736e: am 6a7ac540: am a9f62866: Merge "Framework\'s NetworkSecurityPolicy delegates to libcore\'s one."

* commit '2faa736e7dfab88bfdf1ff7022397af182815503':
  Framework's NetworkSecurityPolicy delegates to libcore's one.