Merge "Add test harness for new keyguard features: - disable all notifications on secure keyguard - disable unredacted notifications on secure keyguard - disable TrustAgents"