Merge "Revert "Check keyguard policy before launching note shortcut at lock...

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21545818



Change-Id: I3df3fce1935cc7dcee5e56a19ce7ced859ab3209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>