am 06b9bb0c: Merge "UserManagerService upgrades users on first restart." into klp-dev

* commit '06b9bb0c813b3d7f93d4069b97cd255f329c4c37':
  UserManagerService upgrades users on first restart.