Merge "Autofill: fix ClassCastException in SaveUi" into pi-dev am: 11d8765624
am: 434df11eee

Change-Id: Ia76186deb74c91bc96a158875be9b965a7449dc4