Merge "Increase the number of test service names" am: dd5bc74532 am: ad9f64a60a

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

Change-Id: I0d25eb170c938bd437b289e067845d879c54bcbc