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

Change-Id: I72f5d6566b4e00198b7d3fbf0101985c0dab56db