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

Change-Id: Iaaad28fba12ebf102e42a55ea7ad2cdb7e89de0a