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: 7cb7b3b9 am: 134c68bb am: 9290c518

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

Change-Id: Ib3a253e7776aacb144aaf87bc150ff8d071337f3