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

Change-Id: Ief2c8bcae4c39a7f51d368cb2b0426deea6bae99