Merge "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: 18c58e8b46

Change-Id: Ib6807c6f13207b4e318f9d4cd1ebd18848487de5