Make DATABASE_VERSION match upgradeVersion.

Commit 5aacacac updated upgradeVersion but not DATABASE_VERSION, which
manifests as:

  W/SettingsProvider(  173): Upgrading settings database from version 56 to 57
  W/SettingsProvider(  173): Got stuck trying to upgrade from version 58, must wipe the settings provider

if someone optimistically attempts to upgrade from e.g. CM6 -> CM7 without
wiping data, like I did.

Change-Id: I22b141f9c69247f77619a32d6d317ac03fb5aa5f