Merge "Fixed autofill compat mode so it works on secondary user." into pi-dev
am: 0b20fa45b8

Change-Id: Ic76d6edfb1a943d26ef7310221e260853e347e4e