Merge "add conversation flags to channel atom" into rvc-dev am: 1d867453ca am: df0222c013

Change-Id: I881eead19db01b5e16f9b102d78c487c357a71ba