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

Change-Id: I977c69b0b5fd33c950eb69281ad29200692d5212