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

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

Change-Id: I6a51f3bf259ae2cd6455f8963bc4753b41cd8eb3