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

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

Change-Id: I73a9810dc476b42a8bfad7461b65227d1115a405