Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328
am: 7f486ec9d7
am: 5fdf4bbfd8
am: ce9b6157d7
Change-Id: I2eb35123556042fc5c27971c6db3719e47c60b19
This commit is contained in: