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