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

Change-Id: Ib1d421b9dbbff5bbcf8987cd4a92e6f50a917c99