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

Change-Id: Ieefae27a9294d0d1071c7b57efdf93b30b693cad