Merge "Fix the exception when shortcut info was removed before loading...

Merge "Fix the exception when shortcut info was removed before loading persisted bubbles" into rvc-dev am: 6c8c9ea8

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

Change-Id: I9d0a2fde53f02c90247be45b1fc4d128cdb671b2