Merge "Call notifyLockedProfile in TrustManagerService instead of KeyguardViewMediator." into nyc-dev