Merge "Added APIs that let AutofillService implementations set themselves as such." into oc-dev