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

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

Change-Id: Icb9dd7aa05f73d1f89fb62b5725a9917e56a652c