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