Merge "Allow some non-MessageStyle notifications to be convos" into rvc-dev am: 91cf4501f8 am: 899a718ebe
Change-Id: I729e65ccd7f95cea9ad25be37867f50ae75dfdef
This commit is contained in:
91cf4501f8 am: 899a718ebe
Change-Id: I729e65ccd7f95cea9ad25be37867f50ae75dfdef