Merge "Rename redactNetworkCapabilitiesForPackage and update its javadoc" am: ba61dca57c am: fb8cdefc31 am: 1708b3cf37

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

Change-Id: I57e9aa72d1e2e483223e66b6ce09764a24223155