Merge "Replace hidden API usages of NetworkCapabilities" into sc-dev