Merge "Hide Autofill UI when non-savable id is gone." into oc-dev am: eee1dd26fa
am: 8f3455c59c

Change-Id: I71fb0e6f4e6befb0d94fcd2b3a04aeaac83c6654