Merge "Revert "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED""