am 5f787dde: am 44e89d3e: Merge "Add test harness for new keyguard features: - disable all notifications on secure keyguard - disable unredacted notifications on secure keyguard - disable TrustAgents"

* commit '5f787dde448f70efb6c9f073d27d3ee069e278e6':