Merge "Merge "Not running certain CTSVerifier tests if the device doesn't support a lockscreen." into oreo-cts-dev am: e32f423eb7" into oreo-mr1-cts-dev