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