Merge " DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r3" into oreo-cts-dev am: 29af131a16  -s ours
am: bb628f7e52

Change-Id: Ia18ba8fa3296c1639a49f58d2924d96d8d4e6e13