Proper autofill fix to let phone process autofill Settings activity. am: 2f58b03ea1 am: 4a8d9b628f  -s ours am: f4c26d98a6  -s ours
am: b7664ec84c  -s ours

Change-Id: I43743a438ac37859972b73611ef8083246f0112c