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

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

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