Merge "Merge "Handle apps that upgrade to full conversations" into rvc-dev am: 01ae9d5c22 am: 944cf071e9" into rvc-d1-dev-plus-aosp