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