Merge "Show Autofill Service icon on Save UI." into oc-mr1-dev am: 0f6599887c
am: db16fb2bbb

Change-Id: Ie681feebfee2dd23a6002c3a81e82199e42c6e16