[automerger skipped] Keep subIds for Test NetworkCapabilities. am: f5a4fb124b am: 7ca2e36684 -s ours

am skip reason: Merged-In I0e1bc617910c9e8ac7b431572f276b1611acc1cb with SHA-1 dd346918b4 is already in history

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

Change-Id: Idf8100ac584d85c137190ef0182a63cb67b66d46