Merge "Add new methods to redact NetworkCapabilities & LinkProperties" am: d537aa42e1 am: bf5b90db4c

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

Change-Id: I2167edac20059226fe519122118539a01fe343d8