Merge "Add constant for autofill-service-add URL" into oc-dev
am: 09d8db0381

Change-Id: Icddb1688c646732f2bb1739d54cd480d4465996b