Merge "Proper autofill fix to let phone process autofill Settings activity."