Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r23" into nougat-cts-dev am: 352f89e459  -s ours" into nougat-mr1-cts-dev am: ef1475eb9b  -s ours" into oreo-cts-dev am: 3f9e9d6822  -s ours" into oc-dev
am: 65109320aa

Change-Id: If4db1abe22660348ba328e63b7fcae17565a7f3f