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

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



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