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