Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev am: b1a97862a2  -s ours" into nougat-mr1-cts-dev am: 84d9743846  -s ours am: 77b71894be
am: c9a9157ac8

Change-Id: I0f3ec4714c933c0e99af03fc6dba08a90c109b54