Merge "Replace hidden API usages of NetworkCapabilities"