Merge "Don't query for the bubble shortcut if it's already on the NotifRecord"...
Merge "Don't query for the bubble shortcut if it's already on the NotifRecord" into rvc-dev am: 30b6e5c7 am: 9de75bd5
Change-Id: Ie5955bf8721443d5a511e3516ab8e87554a7bd89