Merge "Rename redactNetworkCapabilitiesForPackage and update its javadoc" am: ba61dca57c

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

Change-Id: I07c10b58aa6be3aebbecbdc2cde91bda2086683e