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

Change-Id: Ic903d39ce61f83cca8f14dcad4d65077acbbd418