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 am: db8a29df am: 7fe8f43f
Change-Id: I211ec09ba24d8e005fee6c333c1113fdb7df308a