Merge "Fixed the behavior of group conversations when targeting P" into pi-dev
am: c4e19963f4

Change-Id: I7e5feadc253816852528e06719e136a7cba51c49