Merge "[CS04]Remove hidden API usage of NetworkCapabilities"