Make SMS restore robust to device reboots. am: 2d3a779
am: 9e175ce

* commit '9e175ce473fc59026d13be2d80a551fb4f111ae0':
  Make SMS restore robust to device reboots.

Change-Id: I37355b81111be2ceed819ea411e1f425779d540e