Merge commit 'a68fb6e77b78a232179120a2cd8757306ad4b5b4' of sso://googleplex-android/platform/packages/modules/NetworkStack into HEAD
Change-Id: I8952c984015cf9e6431512a0d05c48f0f58f6f81
Ignore-AOSP-First: Internal projects only