Merge "Speed up MmsSmsDatabaseHelper thread updates" am: f4b7936482 am: 6b6d19e5f1  -s ours
am: 5bbcd77e29

* commit '5bbcd77e29a10d78b39db0f438cf786b9268c713':
  Speed up MmsSmsDatabaseHelper thread updates