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: 7315df9c am: dc62476f am: 38b3022a

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



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