fix a bug where timeouts would only be handled when a message was delivered
fix a bug where timeouts would only be handled when a message was delivered

Change-Id: Id3127b21c1a1a1afab32911a8edbb202360d7c9b

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base