[automerger skipped] Keep subIds for Test NetworkCapabilities. am: f5a4fb124b -s ours am: 2052e3076d -s ours
am skip reason: Merged-In I0e1bc617910c9e8ac7b431572f276b1611acc1cb with SHA-1 f5a4fb124b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14969444
Change-Id: Ib32f24c3cea8026acdbd88ce579d19cb61ea2d18
This commit is contained in: