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

Change-Id: Ic2b8972f6089346ae4b721414213809c4d3ae6bc