Merge "DO NOT MERGE Bump CTS version to 8.0_r2" into oreo-cts-dev