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 am: 362219db
Change-Id: I9496b2b891c5eeaf1945bf3951a2396b0e12db3d