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

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

Change-Id: I9d8d7fe3f471670a1819f213e0faf1fc6496e18f