Merge "Sets AutofillClient on attachBaseContext()" into oc-mr1-dev am: 6d17d9d0cf
am: 63b45a87d5

Change-Id: Ib7ae51cf0336c4cea8ff90d60995816d43b3fa36