Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328
am: a8bb57287c
am: 181a657080
am: 59c64fefc0
am: f941055c1d
Change-Id: I566a00ef478fee01920549f84add866912a513f7
This commit is contained in: