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: I51523f4e6f5a1f80c4013ee1823e78b64820feb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>