Merge "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 am: ad104cb5ea" into pi-dev-plus-aosp
am: d40d0d4aad

Change-Id: Ie22d23e041699c8b293fe25fbbf9c42ec4f2d8ca