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

Change-Id: I6cfd79e6465ae9cdf2f86103fd12d6d2abc2b3e0