Merge "Sets AutofillClient on attachBaseContext()" into oc-mr1-dev