Merge "Fix crash when a shortcut update for notes happens before user unlocked" into udc-dev am: 805f89f8 am: f7d32aaa am: bb7a3f4b am: b19b5427

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



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