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: ddb98d9e am: 63e3b1ae

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

Change-Id: Ib32aaebd45239512452432413269594eaa6a82dd