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

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

Change-Id: I56aa9071f1390854618af184362ff0a7dc7378ee