Merge "Move redaction logic showing from Keyguard to PhoneStatusBar."