Merge "Add guidance on conversation notifications" into rvc-dev am: f5590f55 am: 47d9d300 am: db833a5d Change-Id: I404aa94c3ceda409e479395f2117a8cf3e1be335