Merge "Fixed padding of autofill service icon on Save affordance." into oc-mr1-dev am: e15b1c953f
am: 764df64d3c

Change-Id: Ibb385e4d78e09a193976644854e8da2adc442659