am d126d724: Merge "bug:3339065 enable sqlite concurrency enhancing feature on settingsprovider" into honeycomb

* commit 'd126d724f1bcf528775dd14896aa8641cc3b6b97':
  bug:3339065 enable sqlite concurrency enhancing feature on settingsprovider