Merge "Fixed UserManagerService / UserSystemPackageInstaller dump() methods"