Merge "Modified DPM KEYGUARD_DISABLE_SECURE_NOTIFICATIONS restriction"