Merge "Rename redactNetworkCapabilitiesForPackage and update its javadoc"