Merge "Merge "Bug fixed for CTS failed of autofillservice" into oreo-mr1-cts-dev am: ca0920c6cb" into pie-cts-dev