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: I7846d3e0692edea7bcfd72ca8b236df0ca63aaa8