Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r17" into nougat-cts-dev
am: 3ba188137e  -s ours

Change-Id: Icdfd18056c36f4381286e5b834008f3763b21c59