Merge "Temporarily shortened the autofill service names so the CTS tests pass." into pi-dev