Proper autofill fix to let phone process autofill Settings activity. am: 2f58b03e am: 4a8d9b62 -s ours am: f4c26d98 -s ours Change-Id: I568f64d403ef03dfec91b99dd4e0e224631b38b7