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

Change-Id: Ie88d5a75a7d86539aa1bf8504e9d0ceff87a0843