Merge "Fix crash when a shortcut update for notes happens before user...

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

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



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