Merge "Add back ActivityManagerService.onUserRemoved" into rvc-dev