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: Iffad41a6ad73200cbc3f16ead94d3afe5eb1a42a