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

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

Change-Id: Ie631c060ffc40fb8f2b2f77d14cb537b20de5171