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

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

Change-Id: Ifeaf14dc222b139838f15f6454cbc215869e3f20