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