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
am: a7b8fb575e

Change-Id: Ib15935890460ad3b7623052fe4a487fc69fe1c60