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