KEYGUARD: AOSP Keyguard fix