Merge "Revert "Check keyguard policy before launching note shortcut at lock screen"" into udc-dev