Merge "Speed up MmsSmsDatabaseHelper thread updates"
am: f4b7936482

* commit 'f4b79364821c90c945279bf1edc725d0eb934b04':
  Speed up MmsSmsDatabaseHelper thread updates