Merge "Set description of spam blocking promo notification to big text so it won't get cut off." am: dd18cb1330
am: 4eaafab920

Change-Id: I9149b56ff3a0152fd17d68ccc498316bca3c64eb