am 6495bfc7: Follow-up to I36faf679  Cancel pending messages related to suggestion updates.

Merge commit '6495bfc7a6f6bfa6ab82e7f062ee80f4b6b33368' into gingerbread-plus-aosp

* commit '6495bfc7a6f6bfa6ab82e7f062ee80f4b6b33368':
  Follow-up to I36faf679  Cancel pending messages related to suggestion updates.