Merge "Make RedactedNetworkCapabilities compatible with upcoming change" into android14-tests-dev