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

Change-Id: I1556b527a1e6abd21c010eb438c458829fbd81e1