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: f8bfbdb4 am: ddc96a57

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



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