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: 7d4c5213 am: df0545de am: aa63d1c9
Change-Id: Ibfebb2eb7faf8bfc2c5d41a345e13ff55672ecb4