Merge "Add Keyguard Shortcut for Note Task" into tm-qpr-dev am: 5c0efdcd

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



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