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

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

Change-Id: I6e0614d117f8a4912a28cb140c075519d70273eb