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

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

Change-Id: I33cd3d6e9528697f36744417d578845057eab46c