Merge "When dismissing lockscreen, wait up to 1.5 seconds for it to work." into tm-dev

    }

    private fun verifyKeyguardDismissed() {

        val maxWaits = 30

        var waitCount = 0

        while (windowManager.isKeyguardLocked && waitCount < maxWaits) {

            Log.i(TAG, "Keyguard still showing; attempting to dismiss and wait 50ms ($waitCount)")

            windowManager.dismissKeyguard(null, null)

        Thread.sleep(250)

            Thread.sleep(50)

            waitCount++

        }

        assertWithMessage("Keyguard should be unlocked")

            .that(windowManager.isKeyguardLocked)

            .isFalse()