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

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

Change-Id: Ibd3e88c8dfe8fc4b265c49dec6f08df5ea775c81