Merge "autofillservice: Change autofillservice check condition." am: 2206c2cf07
am: 8557b19e07

Change-Id: I909b2aac1f6fd83009628854179b52b9de784df6