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 am: fcf5be08
Change-Id: I588938f6cb6ea698813800d5c126d275d8961cca