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 am: cd10d8b768 am: 86cb50de9b
am: 49c930a283

Change-Id: Ided81d3fd0419abd2000c2734e0fd80aa1f317e4