Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev
am: dd91a5636b

Change-Id: I1b75b8e8ef125620817a1baaea0431b041871bae