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

Change-Id: Ib07dc6354fb3a5fa5ff6171d1c656634465b29fa