Merge "Proper autofill fix to let phone process autofill Settings activity." into oc-mr1-dev
am: f2eddf8df9

Change-Id: I7603e96214ca4e97985b6678cb0e75b7e36d0880