am 63068219: Merge "Change to make sure InboundSmsHandler stm gets out of...
am 63068219: Merge "Change to make sure InboundSmsHandler stm gets out of DeliveringState" into mnc-dev
* commit '63068219':
Change to make sure InboundSmsHandler stm gets out of DeliveringState