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

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

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



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