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 am: f7d32aaa am: bb7a3f4b

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



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