Merge changes Ieae92b5a,I0b22eb9b

* changes:
  Convert @AutoValue CoalescedRow to a proto
  Show spam blocking promo after block spam dialog