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 am: 79aa28b9

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



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