Merge "Update Cts Verifier test to reflect new Settings location" into oreo-cts-dev
am: ea0ae8883f

Change-Id: I34b5df846a37e42fb4f579a7049b2b40278dfd62