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: b261e9d4 am: ce4b7cce
Change-Id: I570d4c3d8b19900e43e6d1c424ef478bf3320f3b