Merge "Adding waitForKeyguardShowingAndNotOccluded on Keyguard tests." into oreo-cts-dev