Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev am: b1a97862a2  -s ours am: 62c6630c03 am: ca923d905f am: f05e1f8242
am: bd0220d609

Change-Id: Icea592a7af1e14a79d2ad6703184a2b8533d529d