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

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

Change-Id: Ib10238237d27ff40e55178a9e180b608efa736f7