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
Change-Id: I91b7bfaa4eb54ee7de187e7b43c70d4fb0c38749