Merge "Group info needed to show a block/report spam dialog into a proto to avoid long method signatures." am: d42fb78b9b am: f44c179d6c
am: 7d67579e40

Change-Id: I6fc32756dcc7647064d6903740c5552cbb1e80bb