Merge "Fix UserManagerService.setUserIcon throwing expt."