Merge "Make RedactedNetworkCapabilities compatible with upcoming change" into main