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: I827feef2224472e04f5678e0df14e6ea586c5235