Revert "Unify logic to check if either Keygaurd or AOD are showing."

This reverts commit b9f3d7ce35fd3107afd682949bba08c975413790.

Reason for revert: MultiDisplayActivityLaunchTests#testLaunchExternalDisplayActivityWhilePrimaryOff() when running the test on devices with AOD (locally reproducible on Walleye & C2).

Change-Id: Ic48edbb45ebc20d1d6109308c3867dab16094827
1 file changed