am 8934c575: am 88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"

# By Yevgen Pronenko
# Via Android Git Automerger (1) and others
* commit '8934c57564a864e046c5172ba7d56ab68056ab26':
  Disable usage of WAL in DatabaseHelper