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: 3334c767
Change-Id: Id9c0239c8ba3cf15e7969f1e8660d5203293fcd5