Merge "Keep subIds for Test NetworkCapabilities." am: 35839b48ad am: f92b7d2eb8

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719793

Change-Id: I1c561a9e9354379e4058854f8267f83f6a8980df