Merge "Add CONTROL_KEYGUARD_SECURE_NOTIFICATIONS to shell app"