Fix problem with SmartReply/Forward and deleted messages

* Please read bug 5112318 for a full analysis of the issue being
  fixed in this CL
* When a send fails with an HTTP 500, and that send uses a "smart"
  command, we retry the send without the "smart" command
* Also handle status 150 for EAS 14 (equivalent to HTTP 500)
* A little bit of cleanup

* Bug: 5112318

Change-Id: Id8325cd324cdc27f3b65b1d14d76da1ead80255c
4 files changed