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

Change-Id: I2c947e9dd500ecd8a1573a1ea288ce6b2fbddf6c