Merge "Increase the number of test service names" am: dd5bc74532 am: 6d2c97852d am: 3e8b4b992c am: 0c9b98c546

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

Change-Id: I69215041efc5cc5fffb629abd1490630845b2afe