Keep subIds for Test NetworkCapabilities. am: f5a4fb124b

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

Change-Id: I8d36d0bf7cbf229710d1c5d69e54b737f3919ec0