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

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

Change-Id: I5ef3ae2b454934effeb1e4c785b9724cb3b37894