Merge "Allow test+other networks to have specifiers" am: 106569b856 am: a2cbef908e

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

Change-Id: I0c1dbe0fb47d534a1d1dd694c31059ca192f6f97