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

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



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