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

Change-Id: I297aa92037623b0728c28bbb2210ba3e6723d57a