Merge "Add new methods to redact NetworkCapabilities & LinkProperties"