Merge "usesCleartextTraffic in NetworkPermissionConfig" am: 46dc3a25e0 am: 21e6f25ab0 am: f30857ae42

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1420011

Change-Id: Ic7f3660102c55c8338fb73bdf75b34b448e1748b