Merge "Allow some non-MessageStyle notifications to be convos" into rvc-dev...
Merge "Allow some non-MessageStyle notifications to be convos" into rvc-dev am: 91cf4501 am: 899a718e am: 6f0b328d am: 806811e3
Change-Id: I7d06f6eb906b3dbf98a4648e0a95820b466a7e04