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

Change-Id: Ifd88b9950acc09e82038ee1929c7932b4fd4261f