Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.1_r17" into oreo-mr1-cts-dev am: e1356810a8 -s ours am: 3a2d592b5f -s ours
am: 3aa8246ef8 -s ours
am skip reason: subject contains skip directive

Change-Id: I713d1172ce78199b3361f4176be47ec4aae67161