Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi"