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

Change-Id: Ib8baaa6194a659f075a1366f28ac74fc5bf9a475