Merge "Added APIs that let AutofillService implementations set themselves as such." into oc-dev am: fc513f98d7
am: 535422c80b

Change-Id: I978f429f100af65df6483364a90e29fc26ae0379