Merge "Merge "[automerger skipped] Merge "DO NOT MERGE - Add CTS test for Settings.ACTION_REQUEST_SET_AUTOFILL_SERVICE" into oreo-cts-dev am: c8896e5d81  -s ours" into oreo-mr1-cts-dev am: a6647ed5da  -s ours"
am: 6a7a1192e1  -s ours

Change-Id: Ie0013d148ec71a052f4accd5a23531fb308320a2