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

Change-Id: I744fa8f76c7c2973a84c11e6a2c2988bbf946d81