Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev