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: 51d1949d am: d850dafd am: 13cb9afa
Change-Id: I00ce8e0eb92ce994c07b9b13183be805548d0342