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

Change-Id: Idecee1722d2f0cb504fb591caa0dc1609361e392