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

* commit '6b6d19e5f1f81baf543dd60e4bcf49c352cfc6ea':
  Speed up MmsSmsDatabaseHelper thread updates