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

* commit '114bf32f9cec80cb7ec8c418c41f044bce2ffd85':
  UserManagerService upgrades users on first restart.