Merge "Keep subIds for Test NetworkCapabilities."