am 1f71d722: Merge "Remove vvm dependence on AccountManager, save values in shared prefs." into mnc-dev

* commit '1f71d7225bf64dc4cf3d2d1e6ec9e0fec4cb76b5':
  Remove vvm dependence on AccountManager, save values in shared prefs.