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 am: 978fea8f

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

Change-Id: I04e250d0d6fcc6ed9e731cd762219fd05e4c14b7