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

Change-Id: Ic445fc0affb1f00f8e0ddc5ee3ef0160adf4fde6